refactoring legacy code